Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Sep 2011 18:18:16 +0000 (11:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Sep 2011 18:18:16 +0000 (11:18 -0700)
commit702a3ac01484808d9bf1523113b4f8a2d7011c63
tree3d7066fcc0a841df8bfb6587ada230b87b055563
parent93ce4a4c3943e4a82efc3eecc3ee9b9da1241e31
parente43e656380040e824c0e1335df1c0984f77144f0
Merge from trunk.